#define SPIN_BUTTON_TIMER_DELAY 20
#define MAX_TEXT_LENGTH 256
#define MAX_TIMER_CALLS 5
+#define EPSILON 1e-5
static void gtk_spin_button_class_init (GtkSpinButtonClass *klass);
static void gtk_spin_button_draw_arrow (GtkSpinButton *spin_button,
guint arrow);
static gint gtk_spin_button_timer (GtkSpinButton *spin_button);
-static void gtk_spin_button_value_changed (GtkWidget *widget,
+static void gtk_spin_button_value_changed (GtkAdjustment *adjustment,
GtkSpinButton *spin_button);
static gint gtk_spin_button_key_press (GtkWidget *widget,
GdkEventKey *event);
gfloat val);
static void gtk_spin_button_insert_text (GtkEditable *editable,
const gchar *new_text,
- gint new_text_length,
+ gint new_text_length,
gint *position);
+static void gtk_spin_button_real_spin (GtkSpinButton *spin_button,
+ guint direction,
+ gfloat step);
-static GtkWidgetClass *parent_class = NULL;
+static GtkEntryClass *parent_class = NULL;
guint
{
spin_button->adjustment = NULL;
spin_button->panel = NULL;
- spin_button->shadow_type = GTK_SHADOW_OUT;
+ spin_button->shadow_type = GTK_SHADOW_NONE;
spin_button->timer = 0;
spin_button->ev_time = 0;
spin_button->climb_rate = 0.0;
spin_button->in_child = 2;
spin_button->click_child = 2;
spin_button->button = 0;
- spin_button->need_timer = 0;
+ spin_button->need_timer = FALSE;
spin_button->timer_calls = 0;
spin_button->digits = 0;
spin_button->numeric = FALSE;
spin_button->snap_to_ticks = FALSE;
}
-void
-gtk_spin_button_construct (GtkSpinButton *spin_button,
- GtkAdjustment *adjustment,
- gfloat climb_rate,
- gint digits)
-{
- char buf[MAX_TEXT_LENGTH];
-
- g_return_if_fail (spin_button != NULL);
- g_return_if_fail (GTK_IS_SPIN_BUTTON (spin_button));
- g_return_if_fail (digits >= 0 && digits < 6);
-
- if (!adjustment)
- adjustment = (GtkAdjustment*) gtk_adjustment_new (0, 0, 0, 0, 0, 0);
-
- gtk_spin_button_set_adjustment (spin_button, adjustment);
- spin_button->digits = digits;
- sprintf (buf, "%0.*f", digits, adjustment->value);
- gtk_entry_set_text (GTK_ENTRY (spin_button), buf);
- spin_button->climb_rate = climb_rate;
-}
-
-GtkWidget *
-gtk_spin_button_new (GtkAdjustment *adjustment,
- gfloat climb_rate,
- gint digits)
-{
- GtkSpinButton *spin;
-
- g_return_val_if_fail (digits >= 0 && digits < 6, NULL);
-
- spin = gtk_type_new (gtk_spin_button_get_type ());
-
- gtk_spin_button_construct (spin, adjustment, climb_rate, digits);
-
- return GTK_WIDGET (spin);
-}
-
static void
gtk_spin_button_finalize (GtkObject *object)
{
spin->click_child = GTK_ARROW_UP;
if (event->button == 1)
{
- gtk_spin_button_spin (spin, spin->click_child,
- spin->adjustment->step_increment);
+ gtk_spin_button_real_spin (spin, spin->click_child,
+ spin->adjustment->step_increment);
if (!spin->timer)
{
spin->timer_step = spin->adjustment->step_increment;
}
else if (event->button == 2)
{
- gtk_spin_button_spin (spin, spin->click_child,
- spin->adjustment->page_increment);
+ gtk_spin_button_real_spin (spin, spin->click_child,
+ spin->adjustment->page_increment);
if (!spin->timer)
{
spin->timer_step = spin->adjustment->page_increment;
spin->click_child = GTK_ARROW_DOWN;
if (event->button == 1)
{
- gtk_spin_button_spin (spin, spin->click_child,
- spin->adjustment->step_increment);
+ gtk_spin_button_real_spin (spin, spin->click_child,
+ spin->adjustment->step_increment);
if (!spin->timer)
{
spin->timer_step = spin->adjustment->step_increment;
}
else if (event->button == 2)
{
- gtk_spin_button_spin (spin, spin->click_child,
- spin->adjustment->page_increment);
+ gtk_spin_button_real_spin (spin, spin->click_child,
+ spin->adjustment->page_increment);
if (!spin->timer)
{
spin->timer_step = spin->adjustment->page_increment;
if (spin_button->timer)
{
- gtk_spin_button_spin (spin_button, spin_button->click_child,
- spin_button->timer_step);
-
- if (spin_button->need_timer) {
- spin_button->need_timer = FALSE;
- spin_button->timer = gtk_timeout_add
- (SPIN_BUTTON_TIMER_DELAY, (GtkFunction) gtk_spin_button_timer,
- (gpointer) spin_button);
- return FALSE;
- }
- else if (spin_button->climb_rate > 0.0 &&
- spin_button->timer_step < spin_button->adjustment->page_increment)
+ gtk_spin_button_real_spin (spin_button, spin_button->click_child,
+ spin_button->timer_step);
+
+ if (spin_button->need_timer)
+ {
+ spin_button->need_timer = FALSE;
+ spin_button->timer = gtk_timeout_add
+ (SPIN_BUTTON_TIMER_DELAY, (GtkFunction) gtk_spin_button_timer,
+ (gpointer) spin_button);
+ return FALSE;
+ }
+ else if (spin_button->climb_rate > 0.0 && spin_button->timer_step
+ < spin_button->adjustment->page_increment)
{
if (spin_button->timer_calls < MAX_TIMER_CALLS)
spin_button->timer_calls++;
spin_button->timer_calls = 0;
spin_button->timer_step += spin_button->climb_rate;
}
- }
+ }
return TRUE;
}
return FALSE;
}
-void
-gtk_spin_button_spin (GtkSpinButton *spin_button,
- guint direction,
- gfloat step)
-{
- gfloat new_value = 0.0;
-
- g_return_if_fail (spin_button != NULL);
- g_return_if_fail (GTK_IS_SPIN_BUTTON (spin_button));
-
- if (direction == GTK_ARROW_UP)
- {
- new_value = spin_button->adjustment->value + step;
- if (spin_button->wrap)
- {
- if (spin_button->adjustment->value == spin_button->adjustment->upper)
- new_value = spin_button->adjustment->lower;
- else if (new_value > spin_button->adjustment->upper)
- new_value = spin_button->adjustment->upper;
- }
- else
- new_value = MIN (new_value, spin_button->adjustment->upper);
- }
- else if (direction == GTK_ARROW_DOWN)
- {
- new_value = spin_button->adjustment->value - step;
- if (spin_button->wrap)
- {
- if (spin_button->adjustment->value == spin_button->adjustment->lower)
- new_value = spin_button->adjustment->upper;
- else if (new_value < spin_button->adjustment->lower)
- new_value = spin_button->adjustment->lower;
- }
- else
- new_value = MAX (new_value, spin_button->adjustment->lower);
- }
-
- if (new_value != spin_button->adjustment->value)
- gtk_adjustment_set_value (spin_button->adjustment, new_value);
-}
-
static void
-gtk_spin_button_value_changed (GtkWidget *widget,
+gtk_spin_button_value_changed (GtkAdjustment *adjustment,
GtkSpinButton *spin_button)
{
char buf[MAX_TEXT_LENGTH];
- g_return_if_fail (widget != NULL);
- g_return_if_fail (GTK_IS_ADJUSTMENT (widget));
-
- sprintf (buf, "%0.*f", spin_button->digits, spin_button->adjustment->value);
+ g_return_if_fail (adjustment != NULL);
+ g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
+ sprintf (buf, "%0.*f", spin_button->digits, adjustment->value);
gtk_entry_set_text (GTK_ENTRY (spin_button), buf);
}
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_SPIN_BUTTON (widget), FALSE);
+ g_return_val_if_fail (event != NULL, FALSE);
spin = GTK_SPIN_BUTTON (widget);
key = event->keyval;
switch (key)
{
case GDK_Up:
+
if (GTK_WIDGET_HAS_FOCUS (widget))
{
gtk_signal_emit_stop_by_name (GTK_OBJECT (widget),
if (!key_repeat)
spin->timer_step = spin->adjustment->step_increment;
- gtk_spin_button_spin (spin, GTK_ARROW_UP, spin->timer_step);
+ gtk_spin_button_real_spin (spin, GTK_ARROW_UP, spin->timer_step);
if (key_repeat)
{
return TRUE;
}
return FALSE;
+
case GDK_Down:
+
if (GTK_WIDGET_HAS_FOCUS (widget))
{
gtk_signal_emit_stop_by_name (GTK_OBJECT (widget),
if (!key_repeat)
spin->timer_step = spin->adjustment->step_increment;
- gtk_spin_button_spin (spin, GTK_ARROW_DOWN, spin->timer_step);
+ gtk_spin_button_real_spin (spin, GTK_ARROW_DOWN, spin->timer_step);
if (key_repeat)
{
return TRUE;
}
return FALSE;
+
case GDK_Page_Up:
+
if (event->state & GDK_CONTROL_MASK)
gtk_adjustment_set_value (spin->adjustment, spin->adjustment->upper);
else
- gtk_spin_button_spin (spin, GTK_ARROW_UP,
- spin->adjustment->page_increment);
+ gtk_spin_button_real_spin (spin, GTK_ARROW_UP,
+ spin->adjustment->page_increment);
return TRUE;
+
case GDK_Page_Down:
+
if (event->state & GDK_CONTROL_MASK)
gtk_adjustment_set_value (spin->adjustment, spin->adjustment->lower);
else
- gtk_spin_button_spin (spin, GTK_ARROW_DOWN,
- spin->adjustment->page_increment);
+ gtk_spin_button_real_spin (spin, GTK_ARROW_DOWN,
+ spin->adjustment->page_increment);
return TRUE;
+
default:
break;
}
+
return GTK_WIDGET_CLASS (parent_class)->key_press_event (widget, event);
}
val = spin_button->adjustment->lower + floor (tmp) * inc;
else
val = spin_button->adjustment->lower + ceil (tmp) * inc;
- gtk_adjustment_set_value (spin_button->adjustment, val);
+
+ if (fabs (val - spin_button->adjustment->value) > EPSILON)
+ gtk_adjustment_set_value (spin_button->adjustment, val);
+ else
+ {
+ char buf[MAX_TEXT_LENGTH];
+
+ sprintf (buf, "%0.*f", spin_button->digits,
+ spin_button->adjustment->value);
+ if (strcmp (buf, gtk_entry_get_text (GTK_ENTRY (spin_button))))
+ gtk_entry_set_text (GTK_ENTRY (spin_button), buf);
+ }
}
static void
val < spin_button->adjustment->lower ||
val > spin_button->adjustment->upper))
{
- gtk_signal_emit_by_name (GTK_OBJECT (spin_button->adjustment),
- "value_changed");
+ gtk_spin_button_value_changed (spin_button->adjustment, spin_button);
return;
}
if (spin_button->snap_to_ticks)
gtk_spin_button_snap (spin_button, val);
else
- gtk_adjustment_set_value (spin_button->adjustment, val);
+ {
+ if (fabs (val - spin_button->adjustment->value) > EPSILON)
+ gtk_adjustment_set_value (spin_button->adjustment, val);
+ else
+ {
+ char buf[MAX_TEXT_LENGTH];
+
+ sprintf (buf, "%0.*f", spin_button->digits,
+ spin_button->adjustment->value);
+ if (strcmp (buf, gtk_entry_get_text (GTK_ENTRY (spin_button))))
+ gtk_entry_set_text (GTK_ENTRY (spin_button), buf);
+ }
+ }
}
static void
gtk_spin_button_update (GTK_SPIN_BUTTON (editable));
}
+static void
+gtk_spin_button_insert_text (GtkEditable *editable,
+ const gchar *new_text,
+ gint new_text_length,
+ gint *position)
+{
+ GtkEntry *entry;
+ GtkSpinButton *spin;
+
+ g_return_if_fail (editable != NULL);
+ g_return_if_fail (GTK_IS_SPIN_BUTTON (editable));
+
+ entry = GTK_ENTRY (editable);
+ spin = GTK_SPIN_BUTTON (editable);
+
+ if (spin->numeric)
+ {
+ struct lconv *lc;
+ gboolean sign;
+ gint dotpos = -1;
+ gint i;
+ gchar pos_sign;
+ gchar neg_sign;
+
+ lc = localeconv ();
+
+ if (*(lc->negative_sign))
+ neg_sign = *(lc->negative_sign);
+ else
+ neg_sign = '-';
+
+ if (*(lc->positive_sign))
+ pos_sign = *(lc->positive_sign);
+ else
+ pos_sign = '+';
+
+ sign = ((strchr (entry->text, neg_sign) != 0) ||
+ (strchr (entry->text, pos_sign) != 0));
+
+ if (sign && !(*position))
+ return;
+
+ dotpos = strchr (entry->text, *(lc->decimal_point)) - entry->text;
+
+ if (dotpos > -1 && *position > dotpos &&
+ spin->digits - entry->text_length + dotpos - new_text_length + 1 < 0)
+ return;
+
+ for (i = 0; i < new_text_length; i++)
+ {
+ if (new_text[i] == neg_sign || new_text[i] == pos_sign)
+ {
+ if (sign || (*position) || i)
+ return;
+ sign = TRUE;
+ }
+ else if (new_text[i] == *(lc->decimal_point))
+ {
+ if (!spin->digits || dotpos > -1 ||
+ (new_text_length - 1 - i + entry->text_length - *position >
+ spin->digits))
+ return;
+ dotpos = *position + i;
+ }
+ else if (new_text[i] < 0x30 || new_text[i] > 0x39)
+ return;
+ }
+ }
+
+ GTK_EDITABLE_CLASS (parent_class)->insert_text (editable, new_text,
+ new_text_length, position);
+}
+
+static void
+gtk_spin_button_real_spin (GtkSpinButton *spin_button,
+ guint direction,
+ gfloat step)
+{
+ GtkAdjustment *adj;
+ gfloat new_value = 0.0;
+
+ g_return_if_fail (spin_button != NULL);
+ g_return_if_fail (GTK_IS_SPIN_BUTTON (spin_button));
+
+ adj = spin_button->adjustment;
+
+ if (direction == GTK_ARROW_UP)
+ {
+ new_value = adj->value + step;
+ if (spin_button->wrap)
+ {
+ if (fabs (adj->value - adj->upper) < EPSILON)
+ new_value = adj->lower;
+ else if (new_value > adj->upper)
+ new_value = adj->upper;
+ }
+ else
+ new_value = MIN (new_value, adj->upper);
+ }
+ else if (direction == GTK_ARROW_DOWN)
+ {
+ new_value = adj->value - step;
+ if (spin_button->wrap)
+ {
+ if (fabs (adj->value - adj->lower) < EPSILON)
+ new_value = adj->upper;
+ else if (new_value < adj->lower)
+ new_value = adj->lower;
+ }
+ else
+ new_value = MAX (new_value, adj->lower);
+ }
+
+ if (fabs (new_value - adj->value) > EPSILON)
+ gtk_adjustment_set_value (adj, new_value);
+}
+
+
+/***********************************************************
+ ***********************************************************
+ *** Public interface ***
+ ***********************************************************
+ ***********************************************************/
+
+
+void
+gtk_spin_button_construct (GtkSpinButton *spin_button,
+ GtkAdjustment *adjustment,
+ gfloat climb_rate,
+ gint digits)
+{
+ char buf[MAX_TEXT_LENGTH];
+
+ g_return_if_fail (spin_button != NULL);
+ g_return_if_fail (GTK_IS_SPIN_BUTTON (spin_button));
+ g_return_if_fail (digits >= 0 && digits < 6);
+
+ if (!adjustment)
+ adjustment = (GtkAdjustment*) gtk_adjustment_new (0, 0, 0, 0, 0, 0);
+
+ gtk_spin_button_set_adjustment (spin_button, adjustment);
+ spin_button->digits = digits;
+ sprintf (buf, "%0.*f", digits, adjustment->value);
+ gtk_entry_set_text (GTK_ENTRY (spin_button), buf);
+ spin_button->climb_rate = climb_rate;
+}
+
+GtkWidget *
+gtk_spin_button_new (GtkAdjustment *adjustment,
+ gfloat climb_rate,
+ gint digits)
+{
+ GtkSpinButton *spin;
+
+ g_return_val_if_fail (digits >= 0 && digits < 6, NULL);
+
+ spin = gtk_type_new (gtk_spin_button_get_type ());
+
+ gtk_spin_button_construct (spin, adjustment, climb_rate, digits);
+
+ return GTK_WIDGET (spin);
+}
+
void
gtk_spin_button_set_adjustment (GtkSpinButton *spin_button,
GtkAdjustment *adjustment)
{
gtk_object_ref (GTK_OBJECT (adjustment));
gtk_object_sink (GTK_OBJECT (adjustment));
- gtk_signal_connect
- (GTK_OBJECT (adjustment), "value_changed",
- (GtkSignalFunc) gtk_spin_button_value_changed,
- (gpointer) spin_button);
+ gtk_signal_connect (GTK_OBJECT (adjustment), "value_changed",
+ (GtkSignalFunc) gtk_spin_button_value_changed,
+ (gpointer) spin_button);
}
}
}
if (spin_button->digits != digits)
{
spin_button->digits = digits;
- gtk_signal_emit_by_name (GTK_OBJECT (spin_button->adjustment),
- "value_changed");
+ gtk_spin_button_value_changed (spin_button->adjustment, spin_button);
}
}
g_return_if_fail (spin_button != NULL);
g_return_if_fail (GTK_IS_SPIN_BUTTON (spin_button));
- if (spin_button->adjustment->value != value)
+ if (fabs (value - spin_button->adjustment->value) > EPSILON)
gtk_adjustment_set_value (spin_button->adjustment, value);
+ else
+ {
+ char buf[MAX_TEXT_LENGTH];
+
+ sprintf (buf, "%0.*f", spin_button->digits,
+ spin_button->adjustment->value);
+ if (strcmp (buf, gtk_entry_get_text (GTK_ENTRY (spin_button))))
+ gtk_entry_set_text (GTK_ENTRY (spin_button), buf);
+ }
}
void
spin_button->numeric = (numeric != 0);
}
-static void
-gtk_spin_button_insert_text (GtkEditable *editable,
- const gchar *new_text,
- gint new_text_length,
- gint *position)
-{
- GtkEntry *entry;
- GtkSpinButton *spin;
-
- g_return_if_fail (editable != NULL);
- g_return_if_fail (GTK_IS_SPIN_BUTTON (editable));
-
- entry = GTK_ENTRY (editable);
- spin = GTK_SPIN_BUTTON (editable);
-
- if (spin->numeric)
- {
- struct lconv *lc;
- gboolean sign;
- gint dotpos = -1;
- gint i;
- gchar pos_sign;
- gchar neg_sign;
-
- lc = localeconv ();
-
- if (*(lc->negative_sign))
- neg_sign = *(lc->negative_sign);
- else
- neg_sign = '-';
-
- if (*(lc->positive_sign))
- pos_sign = *(lc->positive_sign);
- else
- pos_sign = '+';
-
- sign = ((strchr (entry->text, neg_sign) != 0) ||
- (strchr (entry->text, pos_sign) != 0));
-
- if (sign && !(*position))
- return;
-
- dotpos = strchr (entry->text, *(lc->decimal_point)) - entry->text;
-
- if (dotpos > -1 && *position > dotpos &&
- spin->digits - entry->text_length + dotpos - new_text_length + 1 < 0)
- return;
-
- for (i = 0; i < new_text_length; i++)
- {
- if (new_text[i] == neg_sign || new_text[i] == pos_sign)
- {
- if (sign || (*position) || i)
- return;
- sign = TRUE;
- }
- else if (new_text[i] == *(lc->decimal_point))
- {
- if (!spin->digits || dotpos > -1 ||
- (new_text_length - 1 - i + entry->text_length - *position >
- spin->digits))
- return;
- dotpos = *position + i;
- }
- else if (new_text[i] < 0x30 || new_text[i] > 0x39)
- return;
- }
- }
-
- GTK_EDITABLE_CLASS (parent_class)->insert_text (editable, new_text,
- new_text_length, position);
-}
-
void
gtk_spin_button_set_wrap (GtkSpinButton *spin_button,
gint wrap)
}
}
}
+
+void
+gtk_spin_button_spin (GtkSpinButton *spin_button,
+ GtkSpinType direction,
+ gfloat increment)
+{
+ GtkAdjustment *adj;
+ gfloat diff;
+
+ g_return_if_fail (spin_button != NULL);
+ g_return_if_fail (GTK_IS_SPIN_BUTTON (spin_button));
+
+ adj = spin_button->adjustment;
+
+ switch (direction)
+ {
+ case GTK_SPIN_STEP_FORWARD:
+
+ gtk_spin_button_real_spin (spin_button, GTK_ARROW_UP,
+ adj->step_increment);
+ break;
+
+ case GTK_SPIN_STEP_BACKWARD:
+
+ gtk_spin_button_real_spin (spin_button, GTK_ARROW_DOWN,
+ adj->step_increment);
+ break;
+
+ case GTK_SPIN_PAGE_FORWARD:
+
+ gtk_spin_button_real_spin (spin_button, GTK_ARROW_UP,
+ adj->page_increment);
+ break;
+
+ case GTK_SPIN_PAGE_BACKWARD:
+
+ gtk_spin_button_real_spin (spin_button, GTK_ARROW_DOWN,
+ adj->page_increment);
+ break;
+
+ case GTK_SPIN_HOME:
+
+ diff = adj->value - adj->lower;
+ if (diff > EPSILON)
+ gtk_spin_button_real_spin (spin_button, GTK_ARROW_DOWN, diff);
+ break;
+
+ case GTK_SPIN_END:
+
+ diff = adj->upper - adj->value;
+ if (diff > EPSILON)
+ gtk_spin_button_real_spin (spin_button, GTK_ARROW_UP, diff);
+ break;
+
+ case GTK_SPIN_USER_DEFINED:
+
+ if (increment != 0)
+ gtk_spin_button_real_spin (spin_button, (increment < 0) ?
+ GTK_ARROW_DOWN : GTK_ARROW_UP,
+ increment);
+ break;
+
+ default:
+ break;
+ }
+}
projects / gtk4.git / commitdiff